deps include libgtk-x11.la, not libgtk.la (LDADDS): include libgtk-x11.la

Thu Jun  8 21:54:51 2000 Christopher Blizzard  <blizzard@redhat.com>

	* gtk/Makefile.am (DEPS): deps include libgtk-x11.la, not
	libgtk.la
	(LDADDS): include libgtk-x11.la and libgdk-x11.la, not the non-x11
	versions

	* gtk/gtklabel.c (gtk_label_get_text): Make sure that the error
	checking macros return NULL since the function has a return value.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index cb59e29e4fddd88b637589c436351cf4b5f71754..d5fb16300ad37cc23516d792df87fcce22c9e438 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -512,10 +512,10 @@ uninstall-local:
 # test programs, not to be installed
 #
 noinst_PROGRAMS = testgtk testcalendar testinput testselection testrgb testdnd testtext simple testtextbuffer # testthreads
-DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la
+DEPS = libgtk-x11.la $(top_builddir)/gdk/libgdk-x11.la
 LDADDS = @STRIP_BEGIN@ \
-       libgtk.la                       \
-       $(top_builddir)/gdk/libgdk.la   \
+       libgtk-x11.la                   \
+       $(top_builddir)/gdk/libgdk-x11.la       \
        @x_ldflags@                     \
        @x_libs@                        \
        @GDK_WLIBS@                     \

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 6e788dcf6e86de2113936dfc3e04ee8787e21b01..92357439dbf2794bf3bc55f440eac59959b617b6 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -233,8 +233,8 @@ gtk_label_set_text (GtkLabel    *label,
 gchar *
 gtk_label_get_text (GtkLabel *label)
 {
-  g_return_if_fail (label != NULL);
-  g_return_if_fail (GTK_IS_LABEL (label));
+  g_return_val_if_fail (label != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
 
   return g_strdup (label->label);
 }